YUNEEC_Platform: work with new merged master