Merge pull request #121 from jajanusz/platforms-refactor

platform: refactor: deduplicate code for APL&CNL