merge Anton's master 728017d57e91d51b2b9760bffa61dcac413253c2 into multiview; working under IntelliJ with latest PX4 master